From: Jim Blandy <jimb@redhat.com>
Date: Fri, 11 Jun 1993 16:20:38 +0000 (+0000)
Subject: * xrdb.c (get_user_db): Get the screen-specific database too.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95406
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9b37b1c26c4f4aa46aece198382e24b40ec4cc82;p=emacs.git

* xrdb.c (get_user_db): Get the screen-specific database too.
---

diff --git a/src/xrdb.c b/src/xrdb.c
index 19ca21f9e02..6a769e3aa6c 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -314,6 +314,15 @@ get_user_db (display)
       db = XrmGetFileDatabase (xdefault);
     }
 
+#ifdef XlibSpecificationRelease
+#if XlibSpecificationRelease >= 5
+  /* Get the screen-specific resources too.  */
+  xdefs = XScreenResourceString (DefaultScreenOfDisplay (display));
+  if (xdefs != NULL)
+    XrmMergeDatabases (XrmGetStringDatabase (xdefs), &db);
+#endif
+#endif
+
   return db;
 }